[PATCH 1/8] pci: pci_mvebu: Fix write_config() with PCI_SIZE_8 or PCI_SIZE_16

[Stefan Roese]

On 22.10.21 16:22, Pali Rohár wrote:
> Current implementation of write_config() is broken for PCI_SIZE_8 or
> PCI_SIZE_16 as it always uses writel(), which means that write operation
> is always 32-bit, so upper 24 bits for PCI_SIZE_8 and upper 16 bits for
> PCI_SIZE_16 are cleared.
> 
> Fix this by using writeb() and writew(), respectively.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Reviewed-by: Marek Behún <marek.behun at nic.cz>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   drivers/pci/pci_mvebu.c | 15 +++++++++++++--
>   1 file changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
> index 0c1d7cd770f1..8175511514ab 100644
> --- a/drivers/pci/pci_mvebu.c
> +++ b/drivers/pci/pci_mvebu.c
> @@ -211,8 +211,19 @@ static int mvebu_pcie_write_config(struct udevice *bus, pci_dev_t bdf,
>   	writel(PCIE_CONF_ADDR(bdf, offset), pcie->base + PCIE_CONF_ADDR_OFF);
>   
>   	/* write data */
> -	data = pci_conv_size_to_32(0, value, offset, size);
> -	writel(data, pcie->base + PCIE_CONF_DATA_OFF);
> +	switch (size) {
> +	case PCI_SIZE_8:
> +		writeb(value, pcie->base + PCIE_CONF_DATA_OFF + (offset & 3));
> +		break;
> +	case PCI_SIZE_16:
> +		writew(value, pcie->base + PCIE_CONF_DATA_OFF + (offset & 2));
> +		break;
> +	case PCI_SIZE_32:
> +		writel(value, pcie->base + PCIE_CONF_DATA_OFF);
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
>   
>   	return 0;
>   }
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de