Merge branch '2023-02-17-assorted-fixes'
- avb_verify bugfix, and cpsw_mdio bugfix
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 0520a71..48ba8db 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -619,10 +619,11 @@
memset(&arg, 0, sizeof(arg));
tee_optee_ta_uuid_to_octets(arg.uuid, &uuid);
rc = tee_open_session(tee, &arg, 0, NULL);
- if (!rc) {
- ops_data->tee = tee;
- ops_data->session = arg.session;
- }
+ if (rc || arg.ret)
+ continue;
+
+ ops_data->tee = tee;
+ ops_data->session = arg.session;
}
return 0;
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index a5ba73b..ac791fa 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -51,7 +51,7 @@
#define USERACCESS_PHY_REG_SHIFT (21)
#define USERACCESS_PHY_ADDR_SHIFT (16)
#define USERACCESS_DATA GENMASK(15, 0)
- } user[0];
+ } user[2];
};
#define CPSW_MDIO_DIV_DEF 0xff
@@ -366,8 +366,8 @@
struct cpsw_mdio *mdio = bus->priv;
u32 val;
- val = readl(&mdio->regs->control);
- return val & GENMASK(15, 0);
+ val = readl(&mdio->regs->alive);
+ return val & GENMASK(7, 0);
}
struct mii_dev *cpsw_mdio_init(const char *name, phys_addr_t mdio_base,