PCI: brcmstb: enable PCIe for STB chips
Subsystems (29)
v10 cover PCI: brcmstb: enable PCIe for STB chips
Patchset Summary:
Enhance a PCIe host controller driver. Because of its unusual design we are foced to change dev->dma_pfn_offset into a more general role allowing multiple offsets. See the 'v1' notes below for more info.
v10:
Commit: "device-mapping: Introduce DMA range map, supplanting ..." -- change title of commit; "bus core:" => "device-mapping:" -- instead of allocating the DMA map with devm, use kcalloc
and call kfree() during device_release(). (RobH) Also, for three cases that want to use the same DMA map, copy the dma_range_map using a helper function.
-- added a missing 'return = 0;' to of_dma_get_range(). (Nicolas) -- removed dma_range_overlaps(); instead return error if there
is an existing DMA map. (Christoph).
Commit: "PCI: brcmstb: Set additional internal memory DMA ..." -- Changed constant 1 to 1ULL. (Nicolas)
Commit: "ata: ahci_brcm: Fix use of BCM7216 reset controller"
This commit has been removed from this patchset and will be submitted on its own.
v9:
Commit: "device core: Introduce DMA range map, supplanting ..." -- A number of code improvements were implemented as suggested by
ChristophH. Unfortunately, some of these changes reversed the implemented suggestions of other reviewers; for example, the new macros PFN_DMA_ADDR(), DMA_ADDR_PFN() have been pulled.
v8:
Commit: "device core: Introduce DMA range map, supplanting ..." -- To satisfy a specific m68 compile configuration, I moved the 'struct
bus_dma_region; definition out of #ifdef CONFIG_HAS_DMA and also defined three inline functions for !CONFIG_HAS_DMA (kernel test robot).
-- The sunXi drivers -- suc4i_csi, sun6i_csi, cedrus_hw -- set
a pfn_offset outside of_dma_configure() but the code offers no insight on the size of the translation window. V7 had me using SIZE_MAX as the size. I have since contacted the sunXi maintainer and he said that using a size of SZ_4G would cover sunXi configurations.
v7:
Commit: "device core: Introduce DMA range map, supplanting ..." -- remove second kcalloc/copy in device.c (AndyS)
-- use PTR_ERR_OR_ZERO() and PHYS_PFN() (AndyS)
-- indentation, sizeof(struct ...) => sizeof(*r) (AndyS) -- add pfn.h definitions: PFN_DMA_ADDR(), DMA_ADDR_PFN() (AndyS) -- Fixed compile error in "sun6i_csi.c" (kernel test robot) Commit "ata: ahci_brcm: Fix use of BCM7216 reset controller" -- correct name of function in the commit msg (SergeiS)
v6:
Commit "device core: Introduce DMA range map":
-- of_dma_get_range() now takes a single argument and returns either
NULL, a valid map, or an ERR_PTR. (Robin)
-- offsets are no longer a PFN value but an actual address. (Robin) -- the bus_dma_region struct stores the range size instead of
the cpu_end and pci_end values. (Robin)
-- devices that were setting a single offset with no boundaries
have been modified to have boundaries; in a few places where this information was unavilable a /* FIXME: ... */ comment was added. (Robin)
-- dma_attach_offset_range() can be called when an offset
map already exists; if it's range is already present nothing is done and success is returned. (Robin)
All commits:
-- Man name/style/corrections/etc changed (Bjorn)
-- rebase to Torvalds master
v5:
Commit "device core: Introduce multiple dma pfn offsets" -- in of/address.c: "map_size = 0" => "*map_size = 0" -- use kcalloc instead of kzalloc (AndyS)
-- use PHYS_ADDR_MAX instead of "~(phys_addr_t)0" Commit "PCI: brcmstb: Set internal memory viewport sizes" -- now gives error on missing dma-ranges property. Commit "dt-bindings: PCI: Add bindings for more Brcmstb chips" -- removed "Allof:" from brcm,scb-sizes definition (RobH) All Commits:
-- indentation style, use max chars 100 (AndyS)
-- rebased to torvalds master
v4:
Commit "device core: Introduce multiple dma pfn offsets" -- of_dma_get_range() does not take a dev param but instead
takes two "out" params: map and map_size. We do this so that the code that parses dma-ranges is separate from
the code that modifies 'dev'. (Nicolas)
-- the separate case of having a single pfn offset has
been removed and is now processed by going through the map array. (Nicolas)
-- move attach_uniform_dma_pfn_offset() from of/address.c to
dma/mapping.c so that it does not depend on CONFIG_OF. (Nicolas)
-- devm_kcalloc => devm_kzalloc (DanC)
-- add/fix assignment to dev->dma_pfn_offset_map for func
attach_uniform_dma_pfn_offset() (DanC, Nicolas)
-- s/struct dma_pfn_offset_region/struct bus_dma_region/ (Nicolas) -- s/attach_uniform_dma_pfn_offset/dma_attach_uniform_pfn_offset/ -- s/attach_dma_pfn_offset_map/dma_attach_pfn_offset_map/ -- More use of PFN_{PHYS,DOWN,UP}. (AndyS)
Commit "of: Include a dev param in of_dma_get_range()" -- this commit was sqaushed with "device core: Introduce ..."
v3:
Commit "device core: Introduce multiple dma pfn offsets" Commit "arm: dma-mapping: Invoke dma offset func if needed" -- The above two commits have been squashed. More importantly,
the code has been modified so that the functionality for multiple pfn offsets subsumes the use of dev->dma_pfn_offset. In fact, dma_pfn_offset is removed and supplanted by dma_pfn_offset_map, which is a pointer to an array. The more common case of a uniform offset is now handled as a map with a single entry, while cases requiring multiple pfn offsets use a map with multiple entries. Code paths that used to do this:
dev->dma_pfn_offset = mydrivers_pfn_offset;
have been changed to do this:
attach_uniform_dma_pfn_offset(dev, pfn_offset);
Commit "dt-bindings: PCI: Add bindings for more Brcmstb chips" -- Add if/then clause for required props: resets, reset-names (RobH) -- Change compatible list from const to enum (RobH)
-- Change list of u32-tuples to u64 (RobH)
Commit "of: Include a dev param in of_dma_get_range()"
-- modify of/unittests.c to add NULL param in of_dma_get_range() call.
Commit "device core: Add ability to handle multiple dma offsets" -- align comment in device.h (AndyS).
-- s/cpu_beg/cpu_start/ and s/dma_beg/dma_start/ in struct
dma_pfn_offset_region (AndyS).
v2:
Commit: "device core: Add ability to handle multiple dma offsets"
o Added helper func attach_dma_pfn_offset_map() in address.c (Chistoph)
o Helpers funcs added to __phys_to_dma() & __dma_to_phys() (Christoph)
o Added warning when multiple offsets are needed and !DMA_PFN_OFFSET_MAP
o dev->dma_pfn_map => dev->dma_pfn_offset_map
o s/frm/from/ for dma_pfn_offset_frm_{phys,dma}_addr() (Christoph)
o In device.h: s/const void */const struct dma_pfn_offset_region */
o removed 'unlikely' from unlikely(dev->dma_pfn_offset_map) since guarded by CONFIG_DMA_PFN_OFFSET_MAP (Christoph)
o Since dev->dma_pfn_offset is copied in usb/core/{usb,message}.c, now
dev->dma_pfn_offset_map is copied as well.
o Merged two of the DMA commits into one (Christoph).
Commit "arm: dma-mapping: Invoke dma offset func if needed":
o Use helper functions instead of #if CONFIG_DMA_PFN_OFFSET
Other commits' changes:
o Removed need for carrying of_id var in priv (Nicolas)
o Commit message rewordings (Bjorn)
o Commit log messages filled to 75 chars (Bjorn)
o devm_reset_control_get_shared())
=> devm_reset_control_get_optional_shared (Philipp)
o Add call to reset_control_assert() in PCIe remove routines (Philipp)
v1:
This patchset expands the usefulness of the Broadcom Settop Box PCIe controller by building upon the PCIe driver used currently by the Raspbery Pi. Other forms of this patchset were submitted by me years ago and not accepted; the major sticking point was the code required for the DMA remapping needed for the PCIe driver to work [1].
There have been many changes to the DMA and OF subsystems since that time, making a cleaner and less intrusive patchset possible. This patchset implements a generalization of "dev->dma_pfn_offset", except that instead of a single scalar offset it provides for multiple offsets via a function which depends upon the "dma-ranges" property of the PCIe host controller. This is required for proper functionality of the BrcmSTB PCIe controller and possibly some other devices.
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Jim Quinlan (11):
PCI: brcmstb: PCIE_BRCMSTB depends on ARCH_BRCMSTB
dt-bindings: PCI: Add bindings for more Brcmstb chips
PCI: brcmstb: Add bcm7278 register info
PCI: brcmstb: Add suspend and resume pm_ops
PCI: brcmstb: Add bcm7278 PERST# support
PCI: brcmstb: Add control of rescal reset
device-mapping: Introduce DMA range map, supplanting dma_pfn_offset
PCI: brcmstb: Set additional internal memory DMA viewport sizes
PCI: brcmstb: Accommodate MSI for older chips
PCI: brcmstb: Set bus max burst size by chip type
PCI: brcmstb: Add bcm7211, bcm7216, bcm7445, bcm7278 to match list
.../bindings/pci/brcm,stb-pcie.yaml | 56 ++- arch/arm/include/asm/dma-mapping.h | 10 +- arch/arm/mach-keystone/keystone.c | 17 +- arch/sh/drivers/pci/pcie-sh7786.c | 9 +- arch/sh/kernel/dma-coherent.c | 15 +- arch/x86/pci/sta2x11-fixup.c | 7 +- drivers/acpi/arm64/iort.c | 5 +- drivers/base/core.c | 2 + drivers/gpu/drm/sun4i/sun4i_backend.c | 5 +- drivers/iommu/io-pgtable-arm.c | 2 +- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 5 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 4 +- drivers/of/address.c | 72 ++- drivers/of/device.c | 43 +- drivers/of/of_private.h | 10 +- drivers/of/unittest.c | 31 +- drivers/pci/controller/Kconfig | 3 +- drivers/pci/controller/pcie-brcmstb.c | 409 +++++++++++++++--- drivers/remoteproc/remoteproc_core.c | 8 +- .../staging/media/sunxi/cedrus/cedrus_hw.c | 7 +- drivers/usb/core/message.c | 9 +- drivers/usb/core/usb.c | 7 +- include/linux/device.h | 4 +- include/linux/dma-direct.h | 8 +- include/linux/dma-mapping.h | 36 ++ kernel/dma/coherent.c | 10 +- kernel/dma/mapping.c | 65 +++ 27 files changed, 672 insertions(+), 187 deletions(-)
Signature · 1 line
2.17.1
PATCH RESEND v10 1/11 PCI: brcmstb: PCIE_BRCMSTB depends on ARCH_BRCMSTB
From: Jim Quinlan <[email protected]>
Have PCIE_BRCMSTB depend on ARCH_BRCMSTB. Also set the default value to ARCH_BRCMSTB.
--- drivers/pci/controller/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/Kconfig +2 -1
@@ -262,9 +262,10 @@ config VMD config PCIE_BRCMSTB tristate "Broadcom Brcmstb PCIe host controller" - depends on ARCH_BCM2835 || COMPILE_TEST + depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST depends on OF depends on PCI_MSI_IRQ_DOMAIN + default ARCH_BRCMSTB help Say Y here to enable PCIe host controller support for Broadcom STB based SoCs, like the Raspberry Pi 4.
Signature · 1 line
2.17.1
PATCH RESEND v10 2/11 dt-bindings: PCI: Add bindings for more Brcmstb chips
In reply to Jim QuinlanFrom: Jim Quinlan <[email protected]>
- Add compatible strings for three more Broadcom STB chips: 7278, 7216, 7211 (STB version of RPi4).
- Add new property 'brcm,scb-sizes'.
- Add new property 'resets'.
- Add new property 'reset-names' for 7216 only.
- Allow 'ranges' and 'dma-ranges' to have more than one item and update the example to show this.
--- .../bindings/pci/brcm,stb-pcie.yaml | 56 ++++++++++++++++--- 1 file changed, 49 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml +49 -7
@@ -9,12 +9,15 @@ title: Brcmstb PCIe Host Controller Device Tree Bindings maintainers: - Nicolas Saenz Julienne <[email protected]> -allOf: - - $ref: /schemas/pci/pci-bus.yaml# - properties: compatible: - const: brcm,bcm2711-pcie # The Raspberry Pi 4 + items: + - enum: + - brcm,bcm2711-pcie # The Raspberry Pi 4 + - brcm,bcm7211-pcie # Broadcom STB version of RPi4 + - brcm,bcm7278-pcie # Broadcom 7278 Arm + - brcm,bcm7216-pcie # Broadcom 7216 Arm + - brcm,bcm7445-pcie # Broadcom 7445 Arm reg: maxItems: 1
@@ -34,10 +37,12 @@ properties: - const: msi ranges: - maxItems: 1 + minItems: 1 + maxItems: 4 dma-ranges: - maxItems: 1 + minItems: 1 + maxItems: 6 clocks: maxItems: 1
@@ -58,8 +63,31 @@ properties: aspm-no-l0s: true + resets: + description: for "brcm,bcm7216-pcie", must be a valid reset + phandle pointing to the RESCAL reset controller provider node. + $ref: "/schemas/types.yaml#/definitions/phandle" + + reset-names: + items: + - const: rescal + + brcm,scb-sizes: + description: u64 giving the 64bit PCIe memory + viewport size of a memory controller. There may be up to + three controllers, and each size must be a power of two + with a size greater or equal to the amount of memory the + controller supports. Note that each memory controller + may have two component regions -- base and extended -- so + this information cannot be deduced from the dma-ranges. + $ref: /schemas/types.yaml#/definitions/uint64-array + items: + minItems: 1 + maxItems: 3 + required: - reg + - ranges - dma-ranges - "#interrupt-cells" - interrupts
@@ -68,6 +96,18 @@ required: - interrupt-map - msi-controller +allOf: + - $ref: /schemas/pci/pci-bus.yaml# + - if: + properties: + compatible: + contains: + const: brcm,bcm7216-pcie + then: + required: + - resets + - reset-names + unevaluatedProperties: false examples:
@@ -93,7 +133,9 @@ examples: msi-parent = <&pcie0>; msi-controller; ranges = <0x02000000 0x0 0xf8000000 0x6 0x00000000 0x0 0x04000000>; - dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>; + dma-ranges = <0x42000000 0x1 0x00000000 0x0 0x40000000 0x0 0x80000000>, + <0x42000000 0x1 0x80000000 0x3 0x00000000 0x0 0x80000000>; brcm,enable-ssc; + brcm,scb-sizes = <0x0000000080000000 0x0000000080000000>; }; };
Signature · 1 line
2.17.1
PATCH RESEND v10 3/11 PCI: brcmstb: Add bcm7278 register info
In reply to Jim QuinlanFrom: Jim Quinlan <[email protected]>
Add in compatibility strings and code for three Broadcom STB chips. Some of the register locations, shifts, and masks are different for certain chips, requiring the use of different constants based on of_id.
We would like to add the following at this time to the match list but we need to wait until the end of this patchset so that everything works.
{ .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg },
{ .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
{ .compatible = "brcm,bcm7216-pcie", .data = &bcm7278_cfg },
{ .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },--- drivers/pci/controller/pcie-brcmstb.c | 105 +++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 12 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +93 -12
@@ -122,9 +122,8 @@#define PCIE_EXT_SLOT_SHIFT 15#define PCIE_EXT_FUNC_SHIFT 12 -#define PCIE_RGR1_SW_INIT_1 0x9210#define PCIE_RGR1_SW_INIT_1_PERST_MASK 0x1 -#define PCIE_RGR1_SW_INIT_1_INIT_MASK 0x2 +#define PCIE_RGR1_SW_INIT_1_PERST_SHIFT 0x0/* PCIe parameters */ #define BRCM_NUM_PCIE_OUT_WINS 0x4
@@ -154,6 +153,73 @@#define SSC_STATUS_SSC_MASK 0x400#define SSC_STATUS_PLL_LOCK_MASK 0x800 +#define IDX_ADDR (pcie) (pcie->reg_offsets[EXT_CFG_INDEX]) +#define DATA_ADDR (pcie) (pcie->reg_offsets[EXT_CFG_DATA]) +#define PCIE_RGR1_SW_INIT_1 (pcie) (pcie->reg_offsets[RGR1_SW_INIT_1]) + +enum { +RGR1_SW_INIT_1 , +EXT_CFG_INDEX , +EXT_CFG_DATA , +}; + +enum { +RGR1_SW_INIT_1_INIT_MASK , +RGR1_SW_INIT_1_INIT_SHIFT , +}; + +enum pcie_type { +GENERIC , +BCM7278 , +BCM2711 , +}; + +struct pcie_cfg_data { +const int *reg_field_info; +const int *offsets; +const enum pcie_type type; +}; + +static const int pcie_reg_field_info[] = { + [RGR1_SW_INIT_1_INIT_MASK ] =0x2 , + [RGR1_SW_INIT_1_INIT_SHIFT ] =0x1 , +}; + +static const int pcie_reg_field_info_bcm7278[] = { + [RGR1_SW_INIT_1_INIT_MASK ] =0x1 , + [RGR1_SW_INIT_1_INIT_SHIFT ] =0x0 , +}; + +static const int pcie_offsets[] = { + [RGR1_SW_INIT_1 ] =0x9210 , + [EXT_CFG_INDEX ] =0x9000 , + [EXT_CFG_DATA ] =0x9004 , +}; + +static const struct pcie_cfg_data generic_cfg = { + .reg_field_info = pcie_reg_field_info, + .offsets = pcie_offsets, + .type =GENERIC , +}; + +static const int pcie_offset_bcm7278[] = { + [RGR1_SW_INIT_1 ] =0xc010 , + [EXT_CFG_INDEX ] =0x9000 , + [EXT_CFG_DATA ] =0x9004 , +}; + +static const struct pcie_cfg_data bcm7278_cfg = { + .reg_field_info = pcie_reg_field_info_bcm7278, + .offsets = pcie_offset_bcm7278, + .type =BCM7278 , +}; + +static const struct pcie_cfg_data bcm2711_cfg = { + .reg_field_info = pcie_reg_field_info, + .offsets = pcie_offsets, + .type =BCM2711 , +}; +struct brcm_msi {struct device *dev;void __iomem *base;
@@ -178,6 +244,9 @@ struct brcm_pcie {int gen;u64 msi_target_addr;struct brcm_msi *msi; +const int *reg_offsets; +const int *reg_field_info; +enum pcie_type type; };/*
@@ -604,20 +673,21 @@ static struct pci_ops brcm_pcie_ops = {static inline void brcm_pcie_bridge_sw_init_set (struct brcm_pcie *pcie,u32 val) { -u32 tmp; +u32 tmp, mask = pcie->reg_field_info[RGR1_SW_INIT_1_INIT_MASK ]; +u32 shift = pcie->reg_field_info[RGR1_SW_INIT_1_INIT_SHIFT ]; - tmp =readl (pcie->base +PCIE_RGR1_SW_INIT_1 ); -u32p_replace_bits (&tmp, val,PCIE_RGR1_SW_INIT_1_INIT_MASK ); -writel (tmp, pcie->base +PCIE_RGR1_SW_INIT_1 ); + tmp =readl (pcie->base +PCIE_RGR1_SW_INIT_1 (pcie)); + tmp = (tmp & ~mask) | ((val << shift) & mask); +writel (tmp, pcie->base +PCIE_RGR1_SW_INIT_1 (pcie)); }static inline void brcm_pcie_perst_set (struct brcm_pcie *pcie,u32 val) {u32 tmp; - tmp =readl (pcie->base +PCIE_RGR1_SW_INIT_1 ); + tmp =readl (pcie->base +PCIE_RGR1_SW_INIT_1 (pcie));u32p_replace_bits (&tmp, val,PCIE_RGR1_SW_INIT_1_PERST_MASK ); -writel (tmp, pcie->base +PCIE_RGR1_SW_INIT_1 ); +writel (tmp, pcie->base +PCIE_RGR1_SW_INIT_1 (pcie)); } static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie,
@@ -927,11 +997,17 @@ static int brcm_pcie_remove(struct platform_device *pdev)return 0 ; } +static const struct of_device_id brcm_pcie_match[] = { + { .compatible ="brcm,bcm2711-pcie" , .data = &bcm2711_cfg }, + {}, +}; +static int brcm_pcie_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node, *msi_np;struct pci_host_bridge *bridge;struct device_node *fw_np; +const struct pcie_cfg_data *data;struct brcm_pcie *pcie;struct pci_bus *child;struct resource *res;
@@ -955,9 +1031,18 @@ static int brcm_pcie_probe(struct platform_device *pdev)if (!bridge)return -ENOMEM ; + data =of_device_get_match_data (&pdev->dev); +if (!data) { +pr_err ("failed to look up compatible string\n" ); +return -EINVAL ; + } + pcie =pci_host_bridge_priv (bridge); pcie->dev = &pdev->dev; pcie->np = np; + pcie->reg_offsets = data->offsets; + pcie->reg_field_info = data->reg_field_info; + pcie->type = data->type; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); pcie->base =devm_ioremap_resource (&pdev->dev, res);
@@ -1023,10 +1108,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)return ret; } -static const struct of_device_id brcm_pcie_match[] = { - { .compatible ="brcm,bcm2711-pcie" }, - {}, -};MODULE_DEVICE_TABLE (of, brcm_pcie_match);static struct platform_driver brcm_pcie_driver = {
Signature · 1 line
2.17.1
PATCH RESEND v10 4/11 PCI: brcmstb: Add suspend and resume pm_ops
In reply to Jim QuinlanFrom: Jim Quinlan <[email protected]>
Broadcom Set-top (BrcmSTB) boards typically support S2, S3, and S5 suspend and resume. Now the PCIe driver may do so as well.
--- drivers/pci/controller/pcie-brcmstb.c | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
drivers/pci/controller/pcie-brcmstb.c +47 -0
@@ -979,6 +979,47 @@ static void brcm_pcie_turn_off(struct brcm_pcie *pcie)brcm_pcie_bridge_sw_init_set (pcie,1 ); } +static int brcm_pcie_suspend (struct device *dev) +{ +struct brcm_pcie *pcie =dev_get_drvdata (dev); + +brcm_pcie_turn_off (pcie); +clk_disable_unprepare (pcie->clk); + +return 0 ; +} + +static int brcm_pcie_resume (struct device *dev) +{ +struct brcm_pcie *pcie =dev_get_drvdata (dev); +void __iomem *base; +u32 tmp; +int ret; + + base = pcie->base; +clk_prepare_enable (pcie->clk); + +/* Take bridge out of reset so we can access the SERDES reg */ +brcm_pcie_bridge_sw_init_set (pcie,0 ); + +/* SERDES_IDDQ = 0 */ + tmp =readl (base +PCIE_MISC_HARD_PCIE_HARD_DEBUG ); +u32p_replace_bits (&tmp,0 ,PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK ); +writel (tmp, base +PCIE_MISC_HARD_PCIE_HARD_DEBUG ); + +/* wait for serdes to be stable */ +udelay (100 ); + + ret =brcm_pcie_setup (pcie); +if (ret) +return ret; + +if (pcie->msi) +brcm_msi_set_regs (pcie->msi); + +return 0 ; +} +static void __brcm_pcie_remove (struct brcm_pcie *pcie) {brcm_msi_remove (pcie);
@@ -1110,12 +1151,18 @@ static int brcm_pcie_probe(struct platform_device *pdev)MODULE_DEVICE_TABLE (of, brcm_pcie_match); +static const struct dev_pm_ops brcm_pcie_pm_ops = { + .suspend_noirq = brcm_pcie_suspend, + .resume_noirq = brcm_pcie_resume, +}; +static struct platform_driver brcm_pcie_driver = { .probe = brcm_pcie_probe, .remove = brcm_pcie_remove, .driver = { .name ="brcm-pcie" , .of_match_table = brcm_pcie_match, + .pm = &brcm_pcie_pm_ops, }, };module_platform_driver (brcm_pcie_driver);
Signature · 1 line
2.17.1
PATCH RESEND v10 5/11 PCI: brcmstb: Add bcm7278 PERST# support
In reply to Jim QuinlanFrom: Jim Quinlan <[email protected]>
The PERST# bit was moved to a different register in 7278-type STB chips. In addition, the polarity of the bit was also changed; for other chips writing a 1 specified assert; for 7278-type chips, writing a 0 specifies assert.
Of course, PERST# is a PCIe asserted-low signal.
--- drivers/pci/controller/pcie-brcmstb.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +15 -4
@@ -83,6 +83,7 @@#define PCIE_MISC_PCIE_CTRL 0x4064#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK 0x1 +#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK 0x4#define PCIE_MISC_PCIE_STATUS 0x4068#define PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK 0x80
@@ -685,9 +686,16 @@ static inline void brcm_pcie_perst_set(struct brcm_pcie *pcie, u32 val) {u32 tmp; - tmp =readl (pcie->base +PCIE_RGR1_SW_INIT_1 (pcie)); -u32p_replace_bits (&tmp, val,PCIE_RGR1_SW_INIT_1_PERST_MASK ); -writel (tmp, pcie->base +PCIE_RGR1_SW_INIT_1 (pcie)); +if (pcie->type ==BCM7278 ) { +/* Perst bit has moved and assert value is 0 */ + tmp =readl (pcie->base +PCIE_MISC_PCIE_CTRL ); +u32p_replace_bits (&tmp, !val,PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK ); +writel (tmp, pcie->base +PCIE_MISC_PCIE_CTRL ); + }else { + tmp =readl (pcie->base +PCIE_RGR1_SW_INIT_1 (pcie)); +u32p_replace_bits (&tmp, val,PCIE_RGR1_SW_INIT_1_PERST_MASK ); +writel (tmp, pcie->base +PCIE_RGR1_SW_INIT_1 (pcie)); + } } static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie,
@@ -772,7 +780,10 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)/* Reset the bridge */ brcm_pcie_bridge_sw_init_set (pcie,1 ); -brcm_pcie_perst_set (pcie,1 ); + +/* BCM7278 fails when PERST# is set here */ +if (pcie->type !=BCM7278 ) +brcm_pcie_perst_set (pcie,1 );usleep_range (100 ,200 );
Signature · 1 line
2.17.1
PATCH RESEND v10 6/11 PCI: brcmstb: Add control of rescal reset
In reply to Jim QuinlanFrom: Jim Quinlan <[email protected]>
Some STB chips have a special purpose reset controller named RESCAL (reset calibration). The PCIe HW can now control RESCAL to start and stop its operation. On probe(), the RESCAL is deasserted and the driver goes through the sequence of setting registers and reading status in order to start the internal PHY that is required for the PCIe.
--- drivers/pci/controller/pcie-brcmstb.c | 82 ++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-brcmstb.c +81 -1
@@ -23,6 +23,7 @@#include <linux/of_platform.h> #include <linux/pci.h> #include <linux/printk.h> +#include <linux/reset.h> #include <linux/sizes.h> #include <linux/slab.h> #include <linux/string.h>
@@ -158,6 +159,16 @@#define DATA_ADDR (pcie) (pcie->reg_offsets[EXT_CFG_DATA])#define PCIE_RGR1_SW_INIT_1 (pcie) (pcie->reg_offsets[RGR1_SW_INIT_1]) +/* Rescal registers */ +#define PCIE_DVT_PMU_PCIE_PHY_CTRL 0xc700 +#define PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_NFLDS 0x3 +#define PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_DIG_RESET_MASK 0x4 +#define PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_DIG_RESET_SHIFT 0x2 +#define PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_RESET_MASK 0x2 +#define PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_RESET_SHIFT 0x1 +#define PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_PWRDN_MASK 0x1 +#define PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_PWRDN_SHIFT 0x0 +enum {RGR1_SW_INIT_1 ,EXT_CFG_INDEX ,
@@ -248,6 +259,7 @@ struct brcm_pcie {const int *reg_offsets;const int *reg_field_info;enum pcie_type type; +struct reset_control *rescal; };/*
@@ -966,6 +978,47 @@ static void brcm_pcie_enter_l23(struct brcm_pcie *pcie)dev_err (pcie->dev,"failed to enter low-power link state\n" ); } +static int brcm_phy_cntl (struct brcm_pcie *pcie,const int start) +{ +static const u32 shifts[PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_NFLDS ] = { +PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_PWRDN_SHIFT , +PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_RESET_SHIFT , +PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_DIG_RESET_SHIFT ,}; +static const u32 masks[PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_NFLDS ] = { +PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_PWRDN_MASK , +PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_RESET_MASK , +PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_DIG_RESET_MASK ,}; +const int beg = start ?0 :PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_NFLDS -1 ; +const int end = start ?PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_NFLDS :-1 ; +u32 tmp, combined_mask =0 ; +u32 val = !!start; +void __iomem *base = pcie->base; +int i; + +for (i = beg; i != end; start ? i++ : i--) { + tmp =readl (base +PCIE_DVT_PMU_PCIE_PHY_CTRL ); + tmp = (tmp & ~masks[i]) | ((val << shifts[i]) & masks[i]); +writel (tmp, base +PCIE_DVT_PMU_PCIE_PHY_CTRL ); +usleep_range (50 ,200 ); + combined_mask |= masks[i]; + } + + tmp =readl (base +PCIE_DVT_PMU_PCIE_PHY_CTRL ); + val = start ? combined_mask :0 ; + +return (tmp & combined_mask) == val ?0 : -EIO ; +} + +static inline int brcm_phy_start (struct brcm_pcie *pcie) +{ +return pcie->rescal ?brcm_phy_cntl (pcie,1 ) :0 ; +} + +static inline int brcm_phy_stop (struct brcm_pcie *pcie) +{ +return pcie->rescal ?brcm_phy_cntl (pcie,0 ) :0 ; +} +static void brcm_pcie_turn_off (struct brcm_pcie *pcie) {void __iomem *base = pcie->base;
@@ -993,11 +1046,15 @@ static void brcm_pcie_turn_off(struct brcm_pcie *pcie)static int brcm_pcie_suspend (struct device *dev) {struct brcm_pcie *pcie =dev_get_drvdata (dev); +int ret;brcm_pcie_turn_off (pcie); + ret =brcm_phy_stop (pcie); +if (ret) +dev_err (pcie->dev,"failed to stop phy\n" );clk_disable_unprepare (pcie->clk); -return 0 ; +return ret; }static int brcm_pcie_resume (struct device *dev)
@@ -1010,6 +1067,12 @@ static int brcm_pcie_resume(struct device *dev) base = pcie->base;clk_prepare_enable (pcie->clk); + ret =brcm_phy_start (pcie); +if (ret) { +dev_err (pcie->dev,"failed to start phy\n" ); +return ret; + } +/* Take bridge out of reset so we can access the SERDES reg */ brcm_pcie_bridge_sw_init_set (pcie,0 );
@@ -1035,6 +1098,9 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie) {brcm_msi_remove (pcie);brcm_pcie_turn_off (pcie); +if (brcm_phy_stop (pcie)) +dev_err (pcie->dev,"failed to stop phy\n" ); +reset_control_assert (pcie->rescal);clk_disable_unprepare (pcie->clk); }
@@ -1120,6 +1186,20 @@ static int brcm_pcie_probe(struct platform_device *pdev)dev_err (&pdev->dev,"could not enable clock\n" );return ret; } + pcie->rescal =devm_reset_control_get_optional_shared (&pdev->dev,"rescal" ); +if (IS_ERR (pcie->rescal)) +return PTR_ERR (pcie->rescal); + + ret =reset_control_deassert (pcie->rescal); +if (ret) +dev_err (&pdev->dev,"failed to deassert 'rescal'\n" ); + + ret =brcm_phy_start (pcie); +if (ret) { +dev_err (pcie->dev,"failed to start phy\n" ); +reset_control_assert (pcie->rescal); +return ret; + } ret =brcm_pcie_setup (pcie);if (ret)
Signature · 1 line
2.17.1
PATCH RESEND v10 7/11 device-mapping: Introduce DMA range map, supplanting dma_pfn_offset
In reply to Jim QuinlanThe new field 'dma_range_map' in struct device is used to facilitate the use of single or multiple offsets between mapping regions of cpu addrs and dma addrs. It subsumes the role of "dev->dma_pfn_offset" which was only capable of holding a single uniform offset and had no region bounds checking.
The function of_dma_get_range() has been modified so that it takes a single argument -- the device node -- and returns a map, NULL, or an error code. The map is an array that holds the information regarding the DMA regions. Each range entry contains the address offset, the cpu_start address, the dma_start address, and the size of the region.
of_dma_configure() is the typical manner to set range offsets but there are a number of ad hoc assignments to "dev->dma_pfn_offset" in the kernel driver code. These cases now invoke the function dma_attach_offset_range(dev, cpu_addr, dma_addr, size).
--- arch/arm/include/asm/dma-mapping.h | 10 +-- arch/arm/mach-keystone/keystone.c | 17 +++-- arch/sh/drivers/pci/pcie-sh7786.c | 9 +-- arch/sh/kernel/dma-coherent.c | 15 ++-- arch/x86/pci/sta2x11-fixup.c | 7 +- drivers/acpi/arm64/iort.c | 5 +- drivers/base/core.c | 2 + drivers/gpu/drm/sun4i/sun4i_backend.c | 5 +- drivers/iommu/io-pgtable-arm.c | 2 +- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 5 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 4 +- drivers/of/address.c | 72 +++++++++---------- drivers/of/device.c | 43 ++++++----- drivers/of/of_private.h | 10 +-- drivers/of/unittest.c | 31 +++++--- drivers/remoteproc/remoteproc_core.c | 8 ++- .../staging/media/sunxi/cedrus/cedrus_hw.c | 7 +- drivers/usb/core/message.c | 9 ++- drivers/usb/core/usb.c | 7 +- include/linux/device.h | 4 +- include/linux/dma-direct.h | 8 +-- include/linux/dma-mapping.h | 36 ++++++++++ kernel/dma/coherent.c | 10 +-- kernel/dma/mapping.c | 65 +++++++++++++++++ 24 files changed, 269 insertions(+), 122 deletions(-)
arch/arm/include/asm/dma-mapping.h +6 -4
@@ -35,8 +35,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)#ifndef __arch_pfn_to_dmastatic inline dma_addr_t pfn_to_dma (struct device *dev,unsigned long pfn) { -if (dev) - pfn -= dev->dma_pfn_offset; +if (dev) { +phys_addr_t paddr =PFN_PHYS (pfn); + + pfn -= (dma_offset_from_phys_addr (dev, paddr) >>PAGE_SHIFT ); + }return (dma_addr_t )__pfn_to_bus (pfn); }
@@ -45,8 +48,7 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)unsigned long pfn =__bus_to_pfn (addr);if (dev) - pfn += dev->dma_pfn_offset; - + pfn += (dma_offset_from_dma_addr (dev, addr) >>PAGE_SHIFT );return pfn; }
arch/arm/mach-keystone/keystone.c +8 -9
@@ -8,6 +8,7 @@*/ #include <linux/io.h> #include <linux/of.h> +#include <linux/dma-mapping.h> #include <linux/init.h> #include <linux/of_platform.h> #include <linux/of_address.h>
@@ -24,8 +25,6 @@#include "keystone.h" -static unsigned long keystone_dma_pfn_offset__read_mostly ; -static int keystone_platform_notifier (struct notifier_block *nb,unsigned long event,void *data) {
@@ -38,9 +37,12 @@ static int keystone_platform_notifier(struct notifier_block *nb,return NOTIFY_BAD ;if (!dev->of_node) { - dev->dma_pfn_offset = keystone_dma_pfn_offset; -dev_err (dev,"set dma_pfn_offset%08lx\n" , - dev->dma_pfn_offset); +int ret =dma_set_offset_range (dev,KEYSTONE_HIGH_PHYS_START , +KEYSTONE_LOW_PHYS_START , +KEYSTONE_HIGH_PHYS_SIZE ); +dev_err (dev,"set dma_offset%08llx%s\n" , +KEYSTONE_HIGH_PHYS_START -KEYSTONE_LOW_PHYS_START , + ret ?" failed" :"" ); }return NOTIFY_OK ; }
@@ -51,11 +53,8 @@ static struct notifier_block platform_nb = {static void __init keystone_init (void ) { -if (PHYS_OFFSET >=KEYSTONE_HIGH_PHYS_START ) { - keystone_dma_pfn_offset =PFN_DOWN (KEYSTONE_HIGH_PHYS_START - -KEYSTONE_LOW_PHYS_START ); +if (PHYS_OFFSET >=KEYSTONE_HIGH_PHYS_START )bus_register_notifier (&platform_bus_type, &platform_nb); - }keystone_pm_runtime_init (); }
arch/sh/drivers/pci/pcie-sh7786.c +5 -4
@@ -12,6 +12,7 @@#include <linux/io.h> #include <linux/async.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <linux/slab.h> #include <linux/clk.h> #include <linux/sh_clk.h>
@@ -31,6 +32,8 @@ struct sh7786_pcie_port {static struct sh7786_pcie_port *sh7786_pcie_ports;static unsigned int nr_ports;static unsigned long dma_pfn_offset; +size_t memsize; +u64 memstart; static struct sh7786_pcie_hwops { int (*core_init)(void);
@@ -301,7 +304,6 @@ static int __init pcie_init(struct sh7786_pcie_port *port)struct pci_channel *chan = port->hose;unsigned int data;phys_addr_t memstart, memend; -size_t memsize;int ret, i, win;/* Begin initialization */
@@ -368,8 +370,6 @@ static int __init pcie_init(struct sh7786_pcie_port *port) memstart =ALIGN_DOWN (memstart, memsize); memsize =roundup_pow_of_two (memend - memstart); - dma_pfn_offset = memstart >>PAGE_SHIFT ; -/* * If there's more than 512MB of memory, we need to roll over to * LAR1/LAMR1.
@@ -487,7 +487,8 @@ int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)void pcibios_bus_add_device (struct pci_dev *pdev) { - pdev->dev.dma_pfn_offset = dma_pfn_offset; +dma_set_offset_range (&pdev->dev,__pa (memory_start), +__pa (memory_start) - memstart, memsize); }static int __init sh7786_pcie_core_init (void )
arch/sh/kernel/dma-coherent.c +6 -9
@@ -14,6 +14,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, {void *ret, *ret_nocache;int order =get_order (size); +phys_addr_t phys; gfp |= __GFP_ZERO;
@@ -34,12 +35,10 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,return NULL ; } -split_page (pfn_to_page (virt_to_phys (ret) >>PAGE_SHIFT ), order); - - *dma_handle =virt_to_phys (ret); -if (!WARN_ON (!dev)) - *dma_handle -=PFN_PHYS (dev->dma_pfn_offset); + phys =virt_to_phys (ret); +split_page (pfn_to_page (PHYS_PFN (phys)), order); + *dma_handle = (dma_addr_t )phys -dma_offset_from_phys_addr (dev, phys);return ret_nocache; }
@@ -47,12 +46,10 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, unsigned long attrs) { int order = get_order(size); -unsigned long pfn = (dma_handle >>PAGE_SHIFT ); +unsigned long pfn;int k; -if (!WARN_ON (!dev)) - pfn += dev->dma_pfn_offset; - + pfn =PHYS_PFN (dma_handle +dma_offset_from_dma_addr (dev, dma_handle));for (k =0 ; k < (1 << order); k++)__free_pages (pfn_to_page (pfn + k),0 );
arch/x86/pci/sta2x11-fixup.c +5 -2
@@ -12,6 +12,7 @@#include <linux/export.h> #include <linux/list.h> #include <linux/dma-direct.h> +#include <linux/dma-mapping.h> #include <asm/iommu.h> #define STA2X11_SWIOTLB_SIZE (4*1024*1024)
@@ -133,7 +134,7 @@ static void sta2x11_map_ep(struct pci_dev *pdev)struct sta2x11_instance *instance =sta2x11_pdev_to_instance (pdev);struct device *dev = &pdev->dev;u32 amba_base, max_amba_addr; -int i; +int i, ret;if (!instance)return ;
@@ -141,7 +142,9 @@ static void sta2x11_map_ep(struct pci_dev *pdev)pci_read_config_dword (pdev,AHB_BASE (0 ), &amba_base); max_amba_addr = amba_base +STA2X11_AMBA_SIZE -1 ; - dev->dma_pfn_offset =PFN_DOWN (-amba_base); + ret =dma_set_offset_range (dev,0 , amba_base,STA2X11_AMBA_SIZE ); +if (ret) +dev_err (dev,"sta2x11: could not set DMA offset\n" ); dev->bus_dma_limit = max_amba_addr;pci_set_consistent_dma_mask (pdev, max_amba_addr);
drivers/acpi/arm64/iort.c +3 -2
@@ -1142,8 +1142,9 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) *dma_addr = dmaaddr; *dma_size = size; - dev->dma_pfn_offset =PFN_DOWN (offset); -dev_dbg (dev,"dma_pfn_offset(%#08llx)\n" , offset); + ret =dma_set_offset_range (dev, dmaaddr + offset, dmaaddr, size); + +dev_dbg (dev,"dma_offset(%#08llx)%s\n" , offset, ret ?" failed!" :"" ); } static void __init acpi_iort_register_irq(int hwirq, const char *name,
drivers/base/core.c +2 -0
@@ -1571,6 +1571,8 @@ static void device_release(struct kobject *kobj)*/ devres_release_all (dev); +kfree (dev->dma_range_map); +if (dev->release) dev->release (dev);else if (dev->type && dev->type->release)
drivers/gpu/drm/sun4i/sun4i_backend.c +4 -1
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_graph.h> +#include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/reset.h>
@@ -812,7 +813,9 @@ static int sun4i_backend_bind(struct device *dev, struct device *master,* on our device since the RAM mapping is at 0 for the DMA bus, * unlike the CPU. */ - drm->dev->dma_pfn_offset =PHYS_PFN_OFFSET ; + ret =dma_set_offset_range (drm->dev,PHYS_OFFSET ,0 ,SZ_4G ); +if (ret) +return ret; } backend->engine.node = dev->of_node;
drivers/iommu/io-pgtable-arm.c +1 -1
@@ -754,7 +754,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)if (cfg->oas >ARM_LPAE_MAX_ADDR_BITS )return NULL ; -if (!selftest_running && cfg->iommu_dev->dma_pfn_offset) { +if (!selftest_running && cfg->iommu_dev->dma_range_map) {dev_err (cfg->iommu_dev,"Cannot accommodate DMA offset for IOMMU page tables\n" );return NULL ; }
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +4 -1
@@ -7,6 +7,7 @@*/ #include <linux/clk.h> +#include <linux/dma-mapping.h> #include <linux/interrupt.h> #include <linux/module.h> #include <linux/mutex.h>
@@ -183,7 +184,9 @@ static int sun4i_csi_probe(struct platform_device *pdev)return ret; }else {#ifdef PHYS_PFN_OFFSET - csi->dev->dma_pfn_offset =PHYS_PFN_OFFSET ; + ret =dma_set_offset_range (csi->dev,PHYS_OFFSET ,0 ,SZ_4G ); +if (ret) +return ret;#endif }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +3 -1
@@ -898,7 +898,9 @@ static int sun6i_csi_probe(struct platform_device *pdev) sdev->dev = &pdev->dev;/* The DMA bus has the memory mapped at 0 */ - sdev->dev->dma_pfn_offset =PHYS_OFFSET >>PAGE_SHIFT ; + ret =dma_set_offset_range (sdev->dev,PHYS_OFFSET ,0 ,SZ_4G ); +if (ret) +return ret; ret =sun6i_csi_resource_request (sdev, pdev);if (ret)
drivers/of/address.c +32 -40
109 lines not on this page · raw message
drivers/of/device.c +26 -17
93 lines not on this page · raw message
drivers/of/of_private.h +5 -5
@@ -157,12 +157,12 @@ extern void __of_sysfs_remove_bin_file(struct device_node *np,extern int of_bus_n_addr_cells (struct device_node *np);extern int of_bus_n_size_cells (struct device_node *np); -#ifdef CONFIG_OF_ADDRESS -extern int of_dma_get_range (struct device_node *np,u64 *dma_addr, -u64 *paddr,u64 *size); +struct bus_dma_region ; +#if defined(CONFIG_OF_ADDRESS ) && defined(CONFIG_HAS_DMA ) +int of_dma_get_range (struct device_node *np,const struct bus_dma_region **map);#else -static inline int of_dma_get_range (struct device_node *np,u64 *dma_addr, -u64 *paddr,u64 *size) +static inline int of_dma_get_range (struct device_node *np, +const struct bus_dma_region **map) {return -ENODEV ; }
drivers/of/unittest.c +23 -8
@@ -7,6 +7,7 @@#include <linux/memblock.h> #include <linux/clk.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/errno.h> #include <linux/hashtable.h>
@@ -869,10 +870,10 @@ static void __init of_unittest_changeset(void) }static void __init of_unittest_dma_ranges_one (const char *path, -u64 expect_dma_addr,u64 expect_paddr,u64 expect_size) +u64 expect_dma_addr,u64 expect_paddr) {struct device_node *np; -u64 dma_addr, paddr, size; +const struct bus_dma_region *map =NULL ;int rc; np =of_find_node_by_path (path);
@@ -881,16 +882,27 @@ static void __init of_unittest_dma_ranges_one(const char *path,return ; } - rc =of_dma_get_range (np, &dma_addr, &paddr, &size); + rc =of_dma_get_range (np, &map);unittest (!rc,"of_dma_get_range failed on node %pOF rc=%i\n" , np, rc); +if (!rc) { -unittest (size == expect_size, -"of_dma_get_range wrong size on node %pOF size=%llx\n" , np, size); +phys_addr_t paddr; +dma_addr_t dma_addr; +struct device dev_bogus; + + dev_bogus.dma_range_map = map; + paddr = (phys_addr_t )expect_dma_addr + +dma_offset_from_dma_addr (&dev_bogus, expect_dma_addr); + dma_addr = (dma_addr_t )expect_paddr - +dma_offset_from_phys_addr (&dev_bogus, expect_paddr); +unittest (paddr == expect_paddr,"of_dma_get_range wrong phys addr (%llx) on node %pOF" , paddr, np);unittest (dma_addr == expect_dma_addr,"of_dma_get_range wrong DMA addr (%llx) on node %pOF" , dma_addr, np); + +kfree (map); }of_node_put (np); }
@@ -898,11 +910,14 @@ static void __init of_unittest_dma_ranges_one(const char *path,static void __init of_unittest_parse_dma_ranges (void ) {of_unittest_dma_ranges_one ("/testcase-data/address-tests/device@70000000" , -0x0 ,0x20000000 ,0x40000000 ); +0x0 ,0x20000000 );of_unittest_dma_ranges_one ("/testcase-data/address-tests/bus@80000000/device@1000" , -0x10000000 ,0x20000000 ,0x40000000 ); +0x10000000 ,0x20000000 ); +/* pci@90000000 has two ranges in the dma-range property */ +of_unittest_dma_ranges_one ("/testcase-data/address-tests/pci@90000000" , +0x80000000 ,0x20000000 );of_unittest_dma_ranges_one ("/testcase-data/address-tests/pci@90000000" , -0x80000000 ,0x20000000 ,0x10000000 ); +0xc0000000 ,0x40000000 ); }static void __init of_unittest_pci_dma_ranges (void )
drivers/remoteproc/remoteproc_core.c +7 -1
@@ -519,7 +519,13 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,/* Initialise vdev subdevice */ snprintf (name,sizeof (name),"vdev%dbuffer" , rvdev->index); rvdev->dev.parent = &rproc->dev; - rvdev->dev.dma_pfn_offset = rproc->dev.parent->dma_pfn_offset; +if (rproc->dev.parent->dma_range_map) { +const struct bus_dma_region *map = +dma_copy_dma_range_map (rproc->dev.parent->dma_range_map); +if (!map) +return -ENOMEM ; + rvdev->dev.dma_range_map = map; + } rvdev->dev.release = rproc_rvdev_release;dev_set_name (&rvdev->dev,"%s#%s" ,dev_name (rvdev->dev.parent), name);dev_set_drvdata (&rvdev->dev, rvdev);
drivers/staging/media/sunxi/cedrus/cedrus_hw.c +5 -2
@@ -230,8 +230,11 @@ int cedrus_hw_probe(struct cedrus_dev *dev)*/ #ifdef PHYS_PFN_OFFSET -if (!(variant->quirks &CEDRUS_QUIRK_NO_DMA_OFFSET )) - dev->dev->dma_pfn_offset =PHYS_PFN_OFFSET ; +if (!(variant->quirks &CEDRUS_QUIRK_NO_DMA_OFFSET )) { + ret =dma_set_offset_range (dev->dev,PHYS_OFFSET ,0 ,SZ_4G ); +if (ret) +return ret; + }#endif ret =of_reserved_mem_device_init (dev->dev);
drivers/usb/core/message.c +7 -2
@@ -1956,10 +1956,15 @@ int usb_set_configuration(struct usb_device *dev, int configuration) intf->dev.groups = usb_interface_groups;/* * Please refer to usb_alloc_dev() to see why we set -* dma_mask and dma_pfn_offset. +* dma_mask and dma_range_map. */ intf->dev.dma_mask = dev->dev.dma_mask; - intf->dev.dma_pfn_offset = dev->dev.dma_pfn_offset; +if (dev->dev.dma_range_map) { + intf->dev.dma_range_map = +dma_copy_dma_range_map (dev->dev.dma_range_map); +if (!intf->dev.dma_range_map) +dev_err (&dev->dev,"failed to copy DMA map\n" ); + }INIT_WORK (&intf->reset_ws, __usb_queue_reset_device); intf->minor =-1 ;device_initialize (&intf->dev);
drivers/usb/core/usb.c +6 -1
@@ -611,7 +611,12 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,* mask for the entire HCD, so don't do that. */ dev->dev.dma_mask = bus->sysdev->dma_mask; - dev->dev.dma_pfn_offset = bus->sysdev->dma_pfn_offset; +if (bus->sysdev->dma_range_map) { + dev->dev.dma_range_map = +dma_copy_dma_range_map (bus->sysdev->dma_range_map); +if (!dev->dev.dma_range_map) +dev_err (&dev->dev,"failed to copy DMA map\n" ); + }set_dev_node (&dev->dev,dev_to_node (bus->sysdev)); dev->state =USB_STATE_ATTACHED ; dev->lpm_disable_count =1 ;
include/linux/device.h +2 -2
@@ -493,7 +493,7 @@ struct dev_links_info {* such descriptors. * @bus_dma_limit: Limit of an upstream bridge or bus which imposes a smaller * DMA limit than the device itself supports. -* @dma_pfn_offset: offset of DMA memory range relatively of RAM +* @dma_range_map: map for DMA memory ranges relative to that of RAM * @dma_parms: A low level driver may set these to teach IOMMU code about * segment limitations. * @dma_pools: Dma pools (if dma'ble device).
@@ -578,7 +578,7 @@ struct device {64 bit addresses for consistent allocations such descriptors. */ u64 bus_dma_limit;/* upstream dma constraint */ -unsigned long dma_pfn_offset; +const struct bus_dma_region *dma_range_map;struct device_dma_parameters *dma_parms;
include/linux/dma-direct.h +2 -6
@@ -13,16 +13,12 @@ extern unsigned int zone_dma_bits;#else static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) { -dma_addr_t dev_addr = (dma_addr_t )paddr; - -return dev_addr - ((dma_addr_t )dev->dma_pfn_offset <<PAGE_SHIFT ); +return (dma_addr_t )paddr -dma_offset_from_phys_addr (dev, paddr); }static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) { -phys_addr_t paddr = (phys_addr_t )dev_addr; - -return paddr + ((phys_addr_t )dev->dma_pfn_offset <<PAGE_SHIFT ); +return (phys_addr_t )dev_addr +dma_offset_from_dma_addr (dev, dev_addr); }#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */
include/linux/dma-mapping.h +36 -0
@@ -255,7 +255,38 @@ static inline void dma_direct_sync_sg_for_cpu(struct device *dev,size_t dma_direct_max_mapping_size (struct device *dev); +struct bus_dma_region { +phys_addr_t cpu_start; +dma_addr_t dma_start; +u64 size; +u64 offset; +}; +#ifdef CONFIG_HAS_DMA +static inline u64 dma_offset_from_dma_addr (struct device *dev,dma_addr_t dma_addr) +{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (dma_addr >= m->dma_start && dma_addr - m->dma_start < m->size) +return m->offset; +return 0 ; +} + +static inline u64 dma_offset_from_phys_addr (struct device *dev,phys_addr_t paddr) +{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size) +return m->offset; +return 0 ; +} +#include <asm/dma-mapping.h> static inline const struct dma_map_ops *get_dma_ops (struct device *dev)
@@ -801,6 +832,11 @@ static inline void arch_teardown_dma_ops(struct device *dev) }#endif /* CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS */ +int dma_set_offset_range (struct device *dev,phys_addr_t cpu_start, +dma_addr_t dma_start,u64 size); + +void *dma_copy_dma_range_map (const struct bus_dma_region *map); +static inline unsigned int dma_get_max_seg_size (struct device *dev) {if (dev->dma_parms && dev->dma_parms->max_segment_size)
kernel/dma/coherent.c +6 -4
@@ -31,10 +31,12 @@ static inline struct dma_coherent_mem *dev_get_coherent_memory(struct device *destatic inline dma_addr_t dma_get_device_base (struct device *dev,struct dma_coherent_mem * mem) { -if (mem->use_dev_dma_pfn_offset) -return (mem->pfn_base - dev->dma_pfn_offset) <<PAGE_SHIFT ; -else -return mem->device_base; +if (mem->use_dev_dma_pfn_offset) { +u64 base_addr = (u64 )mem->pfn_base <<PAGE_SHIFT ; + +return base_addr -dma_offset_from_phys_addr (dev, base_addr); + } +return mem->device_base; } static int dma_init_coherent_memory(phys_addr_t phys_addr,
kernel/dma/mapping.c +65 -0
74 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH RESEND v10 07/11] device-mapping: Introduce DMA range map, supplanting dma_pfn_offset
Quoted 16 lines · Jim Quinlan
The new field '
dma_range_map' in struct device is used to facilitate the use of single or multiple offsets between mapping regions of cpu addrs and dma addrs. It subsumes the role of "dev->dma_pfn_offset" which was only capable of holding a single uniform offset and had no region bounds checking.The function
of_dma_get_range()has been modified so that it takes a single argument -- the device node -- and returns a map, NULL, or an error code. The map is an array that holds the information regarding the DMA regions. Each range entry contains the address offset, thecpu_startaddress, thedma_startaddress, and the size of the region.
of_dma_configure()is the typical manner to set range offsets but there are a number of ad hoc assignments to "dev->dma_pfn_offset" in the kernel driver code. These cases now invoke the functiondma_attach_offset_range(dev, cpu_addr, dma_addr, size).
...
arch/arm/include/asm/dma-mapping.h static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
Quoted 5 lines
arch/arm/include/asm/dma-mapping.h +4
-0+if (dev) { +phys_addr_t paddr =PFN_PHYS (pfn); + + pfn -= (dma_offset_from_phys_addr (dev, paddr) >>PAGE_SHIFT );
PFN_DOWN() ?
Quoted 1 line
(quoted diff) +1
-0+ }
...
arch/arm/include/asm/dma-mapping.h static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) · line 51
Quoted 1 line
arch/arm/include/asm/dma-mapping.h +1
-0+ pfn += (dma_offset_from_dma_addr (dev, addr) >>PAGE_SHIFT );
Ditto.
...
Quoted 13 lines
include/linux/dma-mapping.h +13
-0+static inline u64 dma_offset_from_dma_addr (struct device *dev,dma_addr_t dma_addr) +{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (dma_addr >= m->dma_start && dma_addr - m->dma_start < m->size) +return m->offset; +return 0 ; +} + +static inline u64 dma_offset_from_phys_addr (struct device *dev,phys_addr_t paddr)
include/linux/dma-mapping.h static inline void dma_direct_sync_sg_for_cpu(struct device *dev, · line 288
Quoted 10 lines
include/linux/dma-mapping.h +10
-0+{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size) +return m->offset; +return 0 ; +}
Perhaps for these the form with one return 0 is easier to read
if (m) {
for (; m->size; m++)
if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size)
return m->offset;
}
return 0;?
...
kernel/dma/coherent.c static inline struct dma_coherent_mem *dev_get_coherent_memory(struct device *de · line 35
Quoted 2 lines
kernel/dma/coherent.c +2
-0+if (mem->use_dev_dma_pfn_offset) { +u64 base_addr = (u64 )mem->pfn_base <<PAGE_SHIFT ;
PFN_PHYS() ?
Quoted 3 lines
kernel/dma/coherent.c +3
-0+ +return base_addr -dma_offset_from_phys_addr (dev, base_addr); + }
...
Quoted 1 line
+ * It returns
-ENOMEMif out of memory, 0 otherwise.
This doesn't describe cases dev->dma_range_map != NULL and offset == 0.
Quoted 25 lines
kernel/dma/mapping.c +25
-0+int dma_set_offset_range (struct device *dev,phys_addr_t cpu_start, +dma_addr_t dma_start,u64 size) +{ +struct bus_dma_region *map; +u64 offset = (u64 )cpu_start - (u64 )dma_start; + +if (!offset) +return 0 ; + +if (dev->dma_range_map) { +dev_err (dev,"attempt to add DMA range to existing map\n" ); +return -EINVAL ; + } + + map =kcalloc (2 ,sizeof (*map),GFP_KERNEL ); +if (!map) +return -ENOMEM ; + map[0 ].cpu_start = cpu_start; + map[0 ].dma_start = dma_start; + map[0 ].offset = offset; + map[0 ].size = size; + dev->dma_range_map = map; + +return 0 ; +}
...
kernel/dma/mapping.c unsigned long dma_get_merge_boundary(struct device *dev) · line 480
Quoted 12 lines
kernel/dma/mapping.c +11
-0+void *dma_copy_dma_range_map (const struct bus_dma_region *map) +{ +int num_ranges; +struct bus_dma_region *new_map; +const struct bus_dma_region *r = map; + +for (num_ranges =0 ; r->size; num_ranges++) + r++; + new_map =kcalloc (num_ranges +1 ,sizeof (*map),GFP_KERNEL ); +if (new_map) +memcpy (new_map, map,sizeof (*map) * num_ranges);
Looks like krealloc() on the first glance...
Quoted 3 lines
kernel/dma/mapping.c +3
-0+ +return new_map; +}
Signature · 8 lines
With Best Regards, Andy Shevchenko _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH RESEND v10 07/11] device-mapping: Introduce DMA range map, supplanting dma_pfn_offset
Hi Anday,
Quoted 21 lines · Andy Shevchenko
Quoted 16 lines · Jim Quinlan
The new field '
dma_range_map' in struct device is used to facilitate the use of single or multiple offsets between mapping regions of cpu addrs and dma addrs. It subsumes the role of "dev->dma_pfn_offset" which was only capable of holding a single uniform offset and had no region bounds checking.The function
of_dma_get_range()has been modified so that it takes a single argument -- the device node -- and returns a map, NULL, or an error code. The map is an array that holds the information regarding the DMA regions. Each range entry contains the address offset, thecpu_startaddress, thedma_startaddress, and the size of the region.
of_dma_configure()is the typical manner to set range offsets but there are a number of ad hoc assignments to "dev->dma_pfn_offset" in the kernel driver code. These cases now invoke the functiondma_attach_offset_range(dev, cpu_addr, dma_addr, size)....
Quoted 7 lines
arch/arm/include/asm/dma-mapping.h static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
Quoted 5 lines
arch/arm/include/asm/dma-mapping.h +4
-0+if (dev) { +phys_addr_t paddr =PFN_PHYS (pfn); + + pfn -= (dma_offset_from_phys_addr (dev, paddr) >>PAGE_SHIFT );
PFN_DOWN()?
Yep.
Quoted 8 lines
Quoted 2 lines
+ }
...
Quoted 1 line
+ pfn += (
dma_offset_from_dma_addr(dev, addr)>>PAGE_SHIFT);Ditto.
Yep.
Quoted 30 lines
...
Quoted 13 lines
include/linux/dma-mapping.h +13
-0+static inline u64 dma_offset_from_dma_addr (struct device *dev,dma_addr_t dma_addr) +{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (dma_addr >= m->dma_start && dma_addr - m->dma_start < m->size) +return m->offset; +return 0 ; +} + +static inline u64 dma_offset_from_phys_addr (struct device *dev,phys_addr_t paddr)include/linux/dma-mapping.h static inline void dma_direct_sync_sg_for_cpu(struct device *dev, · line 288
Quoted 10 lines
include/linux/dma-mapping.h +10
-0+{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size) +return m->offset; +return 0 ; +}Perhaps for these the form with one return 0 is easier to read
Quoted 8 lines
if (m) { for (; m->size; m++) if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size) return m->offset; } return 0;?
I see what you are saying but I don't think there is enough difference between the two to justify changing it.
Quoted 7 lines
...
kernel/dma/coherent.c static inline struct dma_coherent_mem *dev_get_coherent_memory(struct device *de · line 35
Quoted 2 lines
kernel/dma/coherent.c +2
-0+if (mem->use_dev_dma_pfn_offset) { +u64 base_addr = (u64 )mem->pfn_base <<PAGE_SHIFT ;
PFN_PHYS()?
Yep.
Quoted 10 lines
Quoted 4 lines
kernel/dma/coherent.c +3
-0+ +return base_addr -dma_offset_from_phys_addr (dev, base_addr); + }...
Quoted 1 line
+ * It returns
-ENOMEMif out of memory, 0 otherwise.This doesn't describe cases
dev->dma_range_map!= NULL and offset == 0.
Okay, I'll fix this.
Quoted 38 lines
Quoted 26 lines
kernel/dma/mapping.c +25
-0+int dma_set_offset_range (struct device *dev,phys_addr_t cpu_start, +dma_addr_t dma_start,u64 size) +{ +struct bus_dma_region *map; +u64 offset = (u64 )cpu_start - (u64 )dma_start; + +if (!offset) +return 0 ; + +if (dev->dma_range_map) { +dev_err (dev,"attempt to add DMA range to existing map\n" ); +return -EINVAL ; + } + + map =kcalloc (2 ,sizeof (*map),GFP_KERNEL ); +if (!map) +return -ENOMEM ; + map[0 ].cpu_start = cpu_start; + map[0 ].dma_start = dma_start; + map[0 ].offset = offset; + map[0 ].size = size; + dev->dma_range_map = map; + +return 0 ; +}...
Quoted 8 lines
kernel/dma/mapping.c +8
-0+void *dma_copy_dma_range_map (const struct bus_dma_region *map) +{ +int num_ranges; +struct bus_dma_region *new_map; +const struct bus_dma_region *r = map; + +for (num_ranges =0 ; r->size; num_ranges++) + r++;
Quoted 5 lines
kernel/dma/mapping.c unsigned long dma_get_merge_boundary(struct device *dev) · line 480
Quoted 3 lines
kernel/dma/mapping.c +3
-0+ new_map =kcalloc (num_ranges +1 ,sizeof (*map),GFP_KERNEL ); +if (new_map) +memcpy (new_map, map,sizeof (*map) * num_ranges);Looks like
krealloc()on the first glance...
It's not. We are making a distinct copy of the original, not resizing it.
Quoted 8 lines
kernel/dma/mapping.c unsigned long dma_get_merge_boundary(struct device *dev) · line 483
Quoted 4 lines
kernel/dma/mapping.c +3
-0+ +return new_map; +}--
With Best Regards,
Andy Shevchenko
Thanks again,
Jim
Quoted 2 lines
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH RESEND v10 07/11] device-mapping: Introduce DMA range map, supplanting dma_pfn_offset
Quoted 3 lines · Jim Quinlan
Quoted 1 line · Andy Shevchenko
On Mon, Aug 17, 2020 at 05:53:09PM -0400, Jim Quinlan wrote:
...
Quoted 33 lines
Quoted 33 lines
Quoted 13 lines
include/linux/dma-mapping.h +13
-0+static inline u64 dma_offset_from_dma_addr (struct device *dev,dma_addr_t dma_addr) +{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (dma_addr >= m->dma_start && dma_addr - m->dma_start < m->size) +return m->offset; +return 0 ; +} + +static inline u64 dma_offset_from_phys_addr (struct device *dev,phys_addr_t paddr)include/linux/dma-mapping.h static inline void dma_direct_sync_sg_for_cpu(struct device *dev, · line 288
Quoted 10 lines
include/linux/dma-mapping.h +10
-0+{ +const struct bus_dma_region *m = dev->dma_range_map; + +if (!m) +return 0 ; +for (; m->size; m++) +if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size) +return m->offset; +return 0 ; +}Perhaps for these the form with one return 0 is easier to read
if (m) { for (; m->size; m++) if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size) return m->offset; } return 0;
Quoted 3 lines
Quoted 1 line
?
I see what you are saying but I don't think there is enough difference between the two to justify changing it.
The difference is that you have return 0 / non-0 cases one each. I think it's slightly easier to read and understand, but it's up to you.
Signature · 8 lines
With Best Regards, Andy Shevchenko _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH RESEND v10 8/11 PCI: brcmstb: Set additional internal memory DMA viewport sizes
In reply to Jim QuinlanThe Raspberry Pi (RPI) is currently the only chip using this driver (pcie-brcmstb.c). There, only one memory controller is used, without an extension region, and the SCB0 viewport size is set to the size of the first and only dma-range region. Other BrcmSTB SOCs have more complicated memory configurations that require setting additional viewport sizes.
BrcmSTB PCIe controllers are intimately connected to the memory controller(s) on the SOC. The SOC may have one to three memory controllers; they are indicated by the term SCBi. Each controller has a base region and an optional extension region. In physical memory, the base and extension regions of a controller are not adjacent, but in PCIe-space they are.
There is a "viewport" for each memory controller that allows DMA from endpoint devices. Each viewport's size must be set to a power of two, and that size must be equal to or larger than the amount of memory each controller supports which is the sum of base region and its optional extension. Further, the 1-3 viewports are also adjacent in PCIe-space.
Unfortunately the viewport sizes cannot be ascertained from the "dma-ranges" property so they have their own property, "brcm,scb-sizes". This is because dma-range information does not indicate what memory controller it is associated. For example, consider the following case where the size of one dma-range is 2GB and the second dma-range is 1GB:
/* Case 1: SCB0 size set to 4GB */
dma-range0: 2GB (from memc0-base)
dma-range1: 1GB (from memc0-extension)
/* Case 2: SCB0 size set to 2GB, SCB1 size set to 1GB */
dma-range0: 2GB (from memc0-base)
dma-range1: 1GB (from memc0-extension)
By just looking at the dma-ranges information, one cannot tell which situation applies. That is why an additional property is needed. Its length indicates the number of memory controllers being used and each value indicates the viewport size.
Note that the RPI DT does not have a "brcm,scb-sizes" property value, as it is assumed that it only requires one memory controller and no extension. So the optional use of "brcm,scb-sizes" will be backwards compatible.
One last layer of complexity exists: all of the viewports sizes must be added and rounded up to a power of two to determine what the "BAR" size is. Further, an offset must be given that indicates the base PCIe address of this "BAR". The use of the term BAR is typically associated with endpoint devices, and the term is used here because the PCIe HW may be used as an RC or an EP. In the former case, all of the system memory appears in a single "BAR" region in PCIe memory. As it turns out, BrcmSTB PCIe HW is rarely used in the EP role and its system of mapping memory is an artifact that requires multiple dma-ranges regions.
--- drivers/pci/controller/pcie-brcmstb.c | 68 ++++++++++++++++++++------- 1 file changed, 50 insertions(+), 18 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +50 -18
@@ -57,6 +57,8 @@#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK 0x300000#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_128 0x0#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK 0xf8000000 +#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_MASK 0x07c00000 +#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_MASK 0x0000001f#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LO 0x400c#define PCIE_MEM_WIN0_LO (win) \
@@ -154,6 +156,7 @@#define SSC_STATUS_OFFSET 0x1#define SSC_STATUS_SSC_MASK 0x400#define SSC_STATUS_PLL_LOCK_MASK 0x800 +#define PCIE_BRCM_MAX_MEMC 3#define IDX_ADDR (pcie) (pcie->reg_offsets[EXT_CFG_INDEX])#define DATA_ADDR (pcie) (pcie->reg_offsets[EXT_CFG_DATA])
@@ -260,6 +263,8 @@ struct brcm_pcie {const int *reg_field_info;enum pcie_type type;struct reset_control *rescal; +int num_memc; +u64 memc_size[PCIE_BRCM_MAX_MEMC ]; };/*
@@ -715,22 +720,44 @@ static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie, u64 *rc_bar2_offset) {struct pci_host_bridge *bridge =pci_host_bridge_from_priv (pcie); -struct device *dev = pcie->dev;struct resource_entry *entry; +struct device *dev = pcie->dev; +u64 lowest_pcie_addr = ~(u64 )0 ; +int ret, i =0 ; +u64 size =0 ; - entry =resource_list_first_type (&bridge->dma_ranges,IORESOURCE_MEM ); -if (!entry) -return -ENODEV ; +resource_list_for_each_entry (entry, &bridge->dma_ranges) { +u64 pcie_beg = entry->res->start - entry->offset; + size += entry->res->end - entry->res->start +1 ; +if (pcie_beg < lowest_pcie_addr) + lowest_pcie_addr = pcie_beg; + } -/* -* The controller expects the inbound window offset to be calculated as -* the difference between PCIe's address space and CPU's. The offset -* provided by the firmware is calculated the opposite way, so we -* negate it. -*/ - *rc_bar2_offset = -entry->offset; - *rc_bar2_size =1ULL <<fls64 (entry->res->end - entry->res->start); +if (lowest_pcie_addr == ~(u64 )0 ) { +dev_err (dev,"DT node has no dma-ranges\n" ); +return -EINVAL ; + } + + ret =of_property_read_variable_u64_array (pcie->np,"brcm,scb-sizes" , pcie->memc_size,1 , +PCIE_BRCM_MAX_MEMC ); + +if (ret <=0 ) { +/* Make an educated guess */ + pcie->num_memc =1 ; + pcie->memc_size[0 ] =1ULL <<fls64 (size -1 ); + }else { + pcie->num_memc = ret; + } + +/* Each memc is viewed through a "port" that is a power of 2 */ +for (i =0 , size =0 ; i < pcie->num_memc; i++) + size += pcie->memc_size[i]; + +/* System memory starts at this address in PCIe-space */ + *rc_bar2_offset = lowest_pcie_addr; +/* The sum of all memc views must also be a power of 2 */ + *rc_bar2_size =1ULL <<fls64 (size -1 );/* * We validate the inbound memory view even though we should trust
@@ -782,12 +809,11 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)void __iomem *base = pcie->base;struct device *dev = pcie->dev;struct resource_entry *entry; -unsigned int scb_size_val;bool ssc_good = false;struct resource *res;int num_out_wins =0 ;u16 nlw, cls, lnksta; -int i, ret; +int i, ret, memc;u32 tmp, aspm_support;/* Reset the bridge */
@@ -827,11 +853,17 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)writel (upper_32_bits (rc_bar2_offset), base +PCIE_MISC_RC_BAR2_CONFIG_HI ); - scb_size_val = rc_bar2_size ? -ilog2 (rc_bar2_size) -15 :0xf ;/* 0xf is 1GB */ tmp =readl (base +PCIE_MISC_MISC_CTRL ); -u32p_replace_bits (&tmp, scb_size_val, -PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK ); +for (memc =0 ; memc < pcie->num_memc; memc++) { +u32 scb_size_val =ilog2 (pcie->memc_size[memc]) -15 ; + +if (memc ==0 ) +u32p_replace_bits (&tmp, scb_size_val,PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK ); +else if (memc ==1 ) +u32p_replace_bits (&tmp, scb_size_val,PCIE_MISC_MISC_CTRL_SCB1_SIZE_MASK ); +else if (memc ==2 ) +u32p_replace_bits (&tmp, scb_size_val,PCIE_MISC_MISC_CTRL_SCB2_SIZE_MASK ); + }writel (tmp, base +PCIE_MISC_MISC_CTRL );/*
Signature · 1 line
2.17.1
PATCH RESEND v10 9/11 PCI: brcmstb: Accommodate MSI for older chips
In reply to Jim QuinlanFrom: Jim Quinlan <[email protected]>
Older BrcmSTB chips do not have a separate register for MSI interrupts; the MSIs are in a register that also contains unrelated interrupts. In addition, the interrupts lie in bits [31..24] for these legacy chips. This commit provides common code for both legacy and non-legacy MSI interrupt registers.
--- drivers/pci/controller/pcie-brcmstb.c | 71 +++++++++++++++++++-------- 1 file changed, 50 insertions(+), 21 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +50 -21
@@ -82,7 +82,8 @@#define PCIE_MISC_MSI_BAR_CONFIG_HI 0x4048#define PCIE_MISC_MSI_DATA_CONFIG 0x404c -#define PCIE_MISC_MSI_DATA_CONFIG_VAL 0xffe06540 +#define PCIE_MISC_MSI_DATA_CONFIG_VAL_32 0xffe06540 +#define PCIE_MISC_MSI_DATA_CONFIG_VAL_8 0xfff86540#define PCIE_MISC_PCIE_CTRL 0x4064#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK 0x1
@@ -94,6 +95,9 @@#define PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_MASK 0x10#define PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_MASK 0x40 +#define PCIE_MISC_REVISION 0x406c +#define BRCM_PCIE_HW_REV_33 0x0303 +#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT 0x4070#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_MASK 0xfff00000#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_BASE_MASK 0xfff0
@@ -114,10 +118,14 @@#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK 0x2#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK 0x08000000 -#define PCIE_MSI_INTR2_STATUS 0x4500 -#define PCIE_MSI_INTR2_CLR 0x4508 -#define PCIE_MSI_INTR2_MASK_SET 0x4510 -#define PCIE_MSI_INTR2_MASK_CLR 0x4514 + +#define PCIE_INTR2_CPU_BASE 0x4300 +#define PCIE_MSI_INTR2_BASE 0x4500 +/* Offsets from PCIE_INTR2_CPU_BASE and PCIE_MSI_INTR2_BASE */ +#define MSI_INT_STATUS 0x0 +#define MSI_INT_CLR 0x8 +#define MSI_INT_MASK_SET 0x10 +#define MSI_INT_MASK_CLR 0x14#define PCIE_EXT_CFG_DATA 0x8000
@@ -132,6 +140,8 @@/* PCIe parameters */ #define BRCM_NUM_PCIE_OUT_WINS 0x4#define BRCM_INT_PCI_MSI_NR 32 +#define BRCM_INT_PCI_MSI_LEGACY_NR 8 +#define BRCM_INT_PCI_MSI_SHIFT 0/* MSI target adresses */ #define BRCM_MSI_TARGET_ADDR_LT_4GB 0x0fffffffcULL
@@ -246,6 +256,12 @@ struct brcm_msi {int irq;/* used indicates which MSI interrupts have been alloc'd */ unsigned long used; +bool legacy; +/* Some chips have MSIs in bits [31..24] of a shared register. */ +int legacy_shift; +int nr;/* No. of MSI available, depends on chip */ +/* This is the base pointer for interrupt status/set/clr regs */ +void __iomem *intr_base; };/* Internal PCIe Host Controller Information.*/
@@ -265,6 +281,7 @@ struct brcm_pcie {struct reset_control *rescal;int num_memc;u64 memc_size[PCIE_BRCM_MAX_MEMC ]; +u32 hw_rev; };/*
@@ -455,8 +472,10 @@ static void brcm_pcie_msi_isr(struct irq_desc *desc) msi =irq_desc_get_handler_data (desc); dev = msi->dev; - status =readl (msi->base +PCIE_MSI_INTR2_STATUS ); -for_each_set_bit (bit, &status,BRCM_INT_PCI_MSI_NR ) { + status =readl (msi->intr_base +MSI_INT_STATUS ); + status >>= msi->legacy_shift; + +for_each_set_bit (bit, &status, msi->nr) { virq =irq_find_mapping (msi->inner_domain, bit);if (virq)generic_handle_irq (virq);
@@ -473,7 +492,7 @@ static void brcm_msi_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) msg->address_lo =lower_32_bits (msi->target_addr); msg->address_hi =upper_32_bits (msi->target_addr); - msg->data = (0xffff &PCIE_MISC_MSI_DATA_CONFIG_VAL ) | data->hwirq; + msg->data = (0xffff &PCIE_MISC_MSI_DATA_CONFIG_VAL_32 ) | data->hwirq; } static int brcm_msi_set_affinity(struct irq_data *irq_data,
@@ -485,8 +504,9 @@ static int brcm_msi_set_affinity(struct irq_data *irq_data,static void brcm_msi_ack_irq (struct irq_data *data) {struct brcm_msi *msi =irq_data_get_irq_chip_data (data); +const int shift_amt = data->hwirq + msi->legacy_shift; -writel (1 << data->hwirq, msi->base +PCIE_MSI_INTR2_CLR ); +writel (1 << shift_amt, msi->intr_base +MSI_INT_CLR ); }
@@ -502,7 +522,7 @@ static int brcm_msi_alloc(struct brcm_msi *msi)int hwirq;mutex_lock (&msi->lock); - hwirq =bitmap_find_free_region (&msi->used,BRCM_INT_PCI_MSI_NR ,0 ); + hwirq =bitmap_find_free_region (&msi->used, msi->nr,0 );mutex_unlock (&msi->lock);return hwirq;
@@ -551,8 +571,7 @@ static int brcm_allocate_domains(struct brcm_msi *msi)struct fwnode_handle *fwnode =of_node_to_fwnode (msi->np);struct device *dev = msi->dev; - msi->inner_domain =irq_domain_add_linear (NULL ,BRCM_INT_PCI_MSI_NR , - &msi_domain_ops, msi); + msi->inner_domain =irq_domain_add_linear (NULL , msi->nr, &msi_domain_ops, msi);if (!msi->inner_domain) {dev_err (dev,"failed to create IRQ domain\n" );return -ENOMEM ;
@@ -589,7 +608,10 @@ static void brcm_msi_remove(struct brcm_pcie *pcie)static void brcm_msi_set_regs (struct brcm_msi *msi) { -writel (0xffffffff , msi->base +PCIE_MSI_INTR2_MASK_CLR ); +u32 val =__GENMASK (31 , msi->legacy_shift); + +writel (val, msi->intr_base +MSI_INT_MASK_CLR ); +writel (val, msi->intr_base +MSI_INT_CLR );/* * The 0 bit of PCIE_MISC_MSI_BAR_CONFIG_LO is repurposed to MSI
@@ -600,8 +622,8 @@ static void brcm_msi_set_regs(struct brcm_msi *msi)writel (upper_32_bits (msi->target_addr), msi->base +PCIE_MISC_MSI_BAR_CONFIG_HI ); -writel (PCIE_MISC_MSI_DATA_CONFIG_VAL , - msi->base +PCIE_MISC_MSI_DATA_CONFIG ); + val = msi->legacy ?PCIE_MISC_MSI_DATA_CONFIG_VAL_8 :PCIE_MISC_MSI_DATA_CONFIG_VAL_32 ; +writel (val, msi->base +PCIE_MISC_MSI_DATA_CONFIG ); }static int brcm_pcie_enable_msi (struct brcm_pcie *pcie)
@@ -626,6 +648,17 @@ static int brcm_pcie_enable_msi(struct brcm_pcie *pcie) msi->np = pcie->np; msi->target_addr = pcie->msi_target_addr; msi->irq = irq; + msi->legacy = pcie->hw_rev <BRCM_PCIE_HW_REV_33 ; + +if (msi->legacy) { + msi->intr_base = msi->base +PCIE_INTR2_CPU_BASE ; + msi->nr =BRCM_INT_PCI_MSI_LEGACY_NR ; + msi->legacy_shift =24 ; + }else { + msi->intr_base = msi->base +PCIE_MSI_INTR2_BASE ; + msi->nr =BRCM_INT_PCI_MSI_NR ; + msi->legacy_shift =0 ; + } ret =brcm_allocate_domains (msi);if (ret)
@@ -888,12 +921,6 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) tmp &= ~PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_MASK ;writel (tmp, base +PCIE_MISC_RC_BAR3_CONFIG_LO ); -/* Mask all interrupts since we are not handling any yet */ -writel (0xffffffff , pcie->base +PCIE_MSI_INTR2_MASK_SET ); - -/* clear any interrupts we find on boot */ -writel (0xffffffff , pcie->base +PCIE_MSI_INTR2_CLR ); -if (pcie->gen)brcm_pcie_set_gen (pcie, pcie->gen);
@@ -1237,6 +1264,8 @@ static int brcm_pcie_probe(struct platform_device *pdev)if (ret) goto fail; + pcie->hw_rev =readl (pcie->base +PCIE_MISC_REVISION ); + msi_np =of_parse_phandle (pcie->np,"msi-parent" ,0 );if (pci_msi_enabled () && msi_np == pcie->np) { ret =brcm_pcie_enable_msi (pcie);
Signature · 1 line
2.17.1
PATCH RESEND v10 10/11 PCI: brcmstb: Set bus max burst size by chip type
In reply to Jim QuinlanFrom: Jim Quinlan <[email protected]>
The proper value of the parameter SCB_MAX_BURST_SIZE varies per chip. The 2711 family requires 128B whereas other devices can employ 512. The assignment is complicated by the fact that the values for this two-bit field have different meanings;
Value Type_Generic Type_7278
00 Reserved 128B
01 128B 256B
10 256B 512B11 512B Reserved
--- drivers/pci/controller/pcie-brcmstb.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +15 -4
@@ -55,7 +55,7 @@#define PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK 0x1000#define PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK 0x2000#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK 0x300000 -#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_128 0x0 +#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK 0xf8000000#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_MASK 0x07c00000#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_MASK 0x0000001f
@@ -847,7 +847,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)int num_out_wins =0 ;u16 nlw, cls, lnksta;int i, ret, memc; -u32 tmp, aspm_support; +u32 tmp, burst, aspm_support;/* Reset the bridge */ brcm_pcie_bridge_sw_init_set (pcie,1 );
@@ -867,11 +867,22 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)/* Wait for SerDes to be stable */ usleep_range (100 ,200 ); +/* +* SCB_MAX_BURST_SIZE is a two bit field. For GENERIC chips it +* is encoded as 0=128, 1=256, 2=512, 3=Rsvd, for BCM7278 it +* is encoded as 0=Rsvd, 1=128, 2=256, 3=512. +*/ +if (pcie->type ==BCM2711 ) + burst =0x0 ;/* 128B */ +else if (pcie->type ==BCM7278 ) + burst =0x3 ;/* 512 bytes */ +else + burst =0x2 ;/* 512 bytes */ +/* Set SCB_MAX_BURST_SIZE, CFG_READ_UR_MODE, SCB_ACCESS_EN */ u32p_replace_bits (&tmp,1 ,PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK );u32p_replace_bits (&tmp,1 ,PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK ); -u32p_replace_bits (&tmp,PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_128 , -PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK ); +u32p_replace_bits (&tmp, burst,PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK );writel (tmp, base +PCIE_MISC_MISC_CTRL ); ret = brcm_pcie_get_rc_bar2_size_and_offset(pcie, &rc_bar2_size,
Signature · 1 line
2.17.1
PATCH RESEND v10 11/11 PCI: brcmstb: Add bcm7211, bcm7216, bcm7445, bcm7278 to match list
In reply to Jim QuinlanNow that the support is in place with previous commits, we add several chips that use the BrcmSTB driver.
--- drivers/pci/controller/pcie-brcmstb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/pci/controller/pcie-brcmstb.c +4 -0
@@ -1187,6 +1187,10 @@ static int brcm_pcie_remove(struct platform_device *pdev)static const struct of_device_id brcm_pcie_match[] = { { .compatible ="brcm,bcm2711-pcie" , .data = &bcm2711_cfg }, + { .compatible ="brcm,bcm7211-pcie" , .data = &generic_cfg }, + { .compatible ="brcm,bcm7278-pcie" , .data = &bcm7278_cfg }, + { .compatible ="brcm,bcm7216-pcie" , .data = &bcm7278_cfg }, + { .compatible ="brcm,bcm7445-pcie" , .data = &generic_cfg }, {}, };
Signature · 1 line
2.17.1