On Fri, Jun 24, 2022 at 05:39:37PM +0300, Serge Semin wrote: > Instead of manual DW PCIe data version field comparison let's use a handy > macro-based interface in order to shorten out the statements, simplify the > corresponding parts, improve the code readability and maintainability in > perspective when more complex version-based dependencies need to > implemented. Similar approaches have already been implemented in the DWC > USB3 and DW SPI drivers (though with some IP-core evolution specifics). > > Signed-off-by: Serge Semin <Sergey.Semin@xxxxxxxxxxxxxxxxxxxx> > Reviewed-by: Rob Herring <robh@xxxxxxxxxx> > --- > drivers/pci/controller/dwc/pci-keystone.c | 2 +- > drivers/pci/controller/dwc/pcie-designware.c | 8 ++++---- > drivers/pci/controller/dwc/pcie-designware.h | 15 +++++++++++++++ > 3 files changed, 20 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c > index c4ab3d775a18..2a9bbde224af 100644 > --- a/drivers/pci/controller/dwc/pci-keystone.c > +++ b/drivers/pci/controller/dwc/pci-keystone.c > @@ -1233,7 +1233,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) > goto err_get_sync; > } > > - if (pci->version >= DW_PCIE_VER_480A) > + if (dw_pcie_ver_is_ge(pci, 480A)) > ret = ks_pcie_am654_set_mode(dev, mode); > else > ret = ks_pcie_set_mode(dev); > diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c > index cbb36ccaa48b..bd575ad32bc4 100644 > --- a/drivers/pci/controller/dwc/pcie-designware.c > +++ b/drivers/pci/controller/dwc/pcie-designware.c > @@ -313,7 +313,7 @@ static void dw_pcie_prog_outbound_atu_unroll(struct dw_pcie *pci, u8 func_no, > val = type | PCIE_ATU_FUNC_NUM(func_no); > if (upper_32_bits(limit_addr) > upper_32_bits(cpu_addr)) > val |= PCIE_ATU_INCREASE_REGION_SIZE; > - if (pci->version == DW_PCIE_VER_490A) > + if (dw_pcie_ver_is(pci, 490A)) > val = dw_pcie_enable_ecrc(val); > dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL1, val); > dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL2, > @@ -360,7 +360,7 @@ static void __dw_pcie_prog_outbound_atu(struct dw_pcie *pci, u8 func_no, > upper_32_bits(cpu_addr)); > dw_pcie_writel_dbi(pci, PCIE_ATU_LIMIT, > lower_32_bits(limit_addr)); > - if (pci->version >= DW_PCIE_VER_460A) > + if (dw_pcie_ver_is_ge(pci, 460A)) > dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_LIMIT, > upper_32_bits(limit_addr)); > dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_TARGET, > @@ -369,9 +369,9 @@ static void __dw_pcie_prog_outbound_atu(struct dw_pcie *pci, u8 func_no, > upper_32_bits(pci_addr)); > val = type | PCIE_ATU_FUNC_NUM(func_no); > if (upper_32_bits(limit_addr) > upper_32_bits(cpu_addr) && > - pci->version >= DW_PCIE_VER_460A) > + dw_pcie_ver_is_ge(pci, 460A)) > val |= PCIE_ATU_INCREASE_REGION_SIZE; > - if (pci->version == DW_PCIE_VER_490A) > + if (dw_pcie_ver_is(pci, 490A)) > val = dw_pcie_enable_ecrc(val); > dw_pcie_writel_dbi(pci, PCIE_ATU_CR1, val); > dw_pcie_writel_dbi(pci, PCIE_ATU_CR2, PCIE_ATU_ENABLE); > diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h > index 7899808bdbc6..d247f227464c 100644 > --- a/drivers/pci/controller/dwc/pcie-designware.h > +++ b/drivers/pci/controller/dwc/pcie-designware.h > @@ -28,6 +28,21 @@ > #define DW_PCIE_VER_490A 0x3439302a > #define DW_PCIE_VER_520A 0x3532302a > > +#define __dw_pcie_ver_cmp(_pci, _ver, _op) \ > + ((_pci)->version _op DW_PCIE_VER_ ## _ver) > + > +#define dw_pcie_ver_is(_pci, _ver) __dw_pcie_ver_cmp(_pci, _ver, ==) > + > +#define dw_pcie_ver_is_ge(_pci, _ver) __dw_pcie_ver_cmp(_pci, _ver, >=) > + The macro names are not very intuitive. But I cannot come with anything better. > +#define dw_pcie_ver_type_is(_pci, _ver, _type) \ > + (__dw_pcie_ver_cmp(_pci, _ver, ==) && \ > + __dw_pcie_ver_cmp(_pci, TYPE_ ## _type, ==)) > + > +#define dw_pcie_ver_type_is_ge(_pci, _ver, _type) \ > + (__dw_pcie_ver_cmp(_pci, _ver, ==) && \ > + __dw_pcie_ver_cmp(_pci, TYPE_ ## _type, >=)) > + Are these macros used anywhere? Thanks, Mani > /* Parameters for the waiting for link up routine */ > #define LINK_WAIT_MAX_RETRIES 10 > #define LINK_WAIT_USLEEP_MIN 90000 > -- > 2.35.1 > -- மணிவண்ணன் சதாசிவம்
