Re: [PATCH 3/5] PCI: mt7621: avoid custom MIPS code in driver code

From: Bjorn Helgaas
Date: Wed Dec 01 2021 - 13:16:20 EST


s/avoid custom/Avoid custom/ in subject.

On Mon, Nov 15, 2021 at 08:08:07AM +0100, Sergio Paracuellos wrote:
> Driver code is setting up MIPS specific I/O coherency units addresses config.
> This MIPS specific thing has been moved to be done when PCI code call the
> 'pcibios_root_bridge_prepare()' function which has been implemented for MIPS
> ralink mt7621 platform. Hence, remove MIPS specific code from driver code.
> After this changes there is also no need to add any MIPS specific includes
> to avoid some errors reported by Kernet Tets Robot with W=1 builds.

s/this changes/this change/
s/Tets/Test/

The patch doesn't touch any #include lines, so I'm not sure what the
last sentence is telling us.

> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Signed-off-by: Sergio Paracuellos <sergio.paracuellos@xxxxxxxxx>
> ---
> drivers/pci/controller/pcie-mt7621.c | 37 ----------------------------
> 1 file changed, 37 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c
> index b60dfb45ef7b..9cf541f5de9c 100644
> --- a/drivers/pci/controller/pcie-mt7621.c
> +++ b/drivers/pci/controller/pcie-mt7621.c
> @@ -208,37 +208,6 @@ static inline void mt7621_control_deassert(struct mt7621_pcie_port *port)
> reset_control_assert(port->pcie_rst);
> }
>
> -static int setup_cm_memory_region(struct pci_host_bridge *host)
> -{
> - struct mt7621_pcie *pcie = pci_host_bridge_priv(host);
> - struct device *dev = pcie->dev;
> - struct resource_entry *entry;
> - resource_size_t mask;
> -
> - entry = resource_list_first_type(&host->windows, IORESOURCE_MEM);
> - if (!entry) {
> - dev_err(dev, "cannot get memory resource\n");
> - return -EINVAL;
> - }
> -
> - if (mips_cps_numiocu(0)) {
> - /*
> - * FIXME: hardware doesn't accept mask values with 1s after
> - * 0s (e.g. 0xffef), so it would be great to warn if that's
> - * about to happen
> - */
> - mask = ~(entry->res->end - entry->res->start);
> -
> - write_gcr_reg1_base(entry->res->start);
> - write_gcr_reg1_mask(mask | CM_GCR_REGn_MASK_CMTGT_IOCU0);
> - dev_info(dev, "PCI coherence region base: 0x%08llx, mask/settings: 0x%08llx\n",
> - (unsigned long long)read_gcr_reg1_base(),
> - (unsigned long long)read_gcr_reg1_mask());
> - }
> -
> - return 0;
> -}
> -
> static int mt7621_pcie_parse_port(struct mt7621_pcie *pcie,
> struct device_node *node,
> int slot)
> @@ -557,12 +526,6 @@ static int mt7621_pci_probe(struct platform_device *pdev)
> goto remove_resets;
> }
>
> - err = setup_cm_memory_region(bridge);
> - if (err) {
> - dev_err(dev, "error setting up iocu mem regions\n");
> - goto remove_resets;
> - }
> -
> return mt7621_pcie_register_host(bridge);
>
> remove_resets:
> --
> 2.33.0
>