| Message ID | 5ddda7cc6940941b645564afff5afa496d7dbb68.1505989703.git.chunfeng.yun@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thursday 21 September 2017 04:01 PM, Chunfeng Yun wrote: > Chip bank of version-1 is initialized as NULL, but it's used > by pcie_phy_instance_power_on/off(), so assign it a right > address. merged. How was this not noticed before? Thanks Kishon > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > --- > drivers/phy/mediatek/phy-mtk-tphy.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c > index e3baad7..721a2a1 100644 > --- a/drivers/phy/mediatek/phy-mtk-tphy.c > +++ b/drivers/phy/mediatek/phy-mtk-tphy.c > @@ -27,6 +27,7 @@ > /* banks shared by multiple phys */ > #define SSUSB_SIFSLV_V1_SPLLC 0x000 /* shared by u3 phys */ > #define SSUSB_SIFSLV_V1_U2FREQ 0x100 /* shared by u2 phys */ > +#define SSUSB_SIFSLV_V1_CHIP 0x300 /* shared by u3 phys */ > /* u2 phy bank */ > #define SSUSB_SIFSLV_V1_U2PHY_COM 0x000 > /* u3/pcie/sata phy banks */ > @@ -762,7 +763,7 @@ static void phy_v1_banks_init(struct mtk_tphy *tphy, > case PHY_TYPE_USB3: > case PHY_TYPE_PCIE: > u3_banks->spllc = tphy->sif_base + SSUSB_SIFSLV_V1_SPLLC; > - u3_banks->chip = NULL; > + u3_banks->chip = tphy->sif_base + SSUSB_SIFSLV_V1_CHIP; > u3_banks->phyd = instance->port_base + SSUSB_SIFSLV_V1_U3PHYD; > u3_banks->phya = instance->port_base + SSUSB_SIFSLV_V1_U3PHYA; > break; >
On Thu, 2017-09-21 at 16:23 +0530, Kishon Vijay Abraham I wrote: > > On Thursday 21 September 2017 04:01 PM, Chunfeng Yun wrote: > > Chip bank of version-1 is initialized as NULL, but it's used > > by pcie_phy_instance_power_on/off(), so assign it a right > > address. > > merged. How was this not noticed before? The PCIe function was tested on mt2712 with tphy-v2, and didn't notice this issue until tested it on mt7622 with tphy-v1. Ashamed of myself for making such a rookie mistake. > > Thanks > Kishon > > > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > > --- > > drivers/phy/mediatek/phy-mtk-tphy.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c > > index e3baad7..721a2a1 100644 > > --- a/drivers/phy/mediatek/phy-mtk-tphy.c > > +++ b/drivers/phy/mediatek/phy-mtk-tphy.c > > @@ -27,6 +27,7 @@ > > /* banks shared by multiple phys */ > > #define SSUSB_SIFSLV_V1_SPLLC 0x000 /* shared by u3 phys */ > > #define SSUSB_SIFSLV_V1_U2FREQ 0x100 /* shared by u2 phys */ > > +#define SSUSB_SIFSLV_V1_CHIP 0x300 /* shared by u3 phys */ > > /* u2 phy bank */ > > #define SSUSB_SIFSLV_V1_U2PHY_COM 0x000 > > /* u3/pcie/sata phy banks */ > > @@ -762,7 +763,7 @@ static void phy_v1_banks_init(struct mtk_tphy *tphy, > > case PHY_TYPE_USB3: > > case PHY_TYPE_PCIE: > > u3_banks->spllc = tphy->sif_base + SSUSB_SIFSLV_V1_SPLLC; > > - u3_banks->chip = NULL; > > + u3_banks->chip = tphy->sif_base + SSUSB_SIFSLV_V1_CHIP; > > u3_banks->phyd = instance->port_base + SSUSB_SIFSLV_V1_U3PHYD; > > u3_banks->phya = instance->port_base + SSUSB_SIFSLV_V1_U3PHYA; > > break; > >
diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c index e3baad7..721a2a1 100644 --- a/drivers/phy/mediatek/phy-mtk-tphy.c +++ b/drivers/phy/mediatek/phy-mtk-tphy.c @@ -27,6 +27,7 @@ /* banks shared by multiple phys */ #define SSUSB_SIFSLV_V1_SPLLC 0x000 /* shared by u3 phys */ #define SSUSB_SIFSLV_V1_U2FREQ 0x100 /* shared by u2 phys */ +#define SSUSB_SIFSLV_V1_CHIP 0x300 /* shared by u3 phys */ /* u2 phy bank */ #define SSUSB_SIFSLV_V1_U2PHY_COM 0x000 /* u3/pcie/sata phy banks */ @@ -762,7 +763,7 @@ static void phy_v1_banks_init(struct mtk_tphy *tphy, case PHY_TYPE_USB3: case PHY_TYPE_PCIE: u3_banks->spllc = tphy->sif_base + SSUSB_SIFSLV_V1_SPLLC; - u3_banks->chip = NULL; + u3_banks->chip = tphy->sif_base + SSUSB_SIFSLV_V1_CHIP; u3_banks->phyd = instance->port_base + SSUSB_SIFSLV_V1_U3PHYD; u3_banks->phya = instance->port_base + SSUSB_SIFSLV_V1_U3PHYA; break;
Chip bank of version-1 is initialized as NULL, but it's used by pcie_phy_instance_power_on/off(), so assign it a right address. Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> --- drivers/phy/mediatek/phy-mtk-tphy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)